Fixed some models to make the tests pass. still needs more work