Model tests

Still contains factory & faker issues