Fixed function mocking for rich data

This fixes #159 and means that functions that are mocked now reliably return the data type that they were passed in the YAML. Also gets around some big errors that you can get by passing strange strings