fixing relationships in models, cleaning up tests
moar tests, add some relationships I missed to the model