Weird thing just started happening with the wsgi file
Fix tests to reflect new model structure
Test this M2M backwards and forwards