moved tests into the package; fixed validation issue a dictionary was being returned instead of an instance of the ModelType