Removed NullableForeignKey
removed boilerplate tests
moved old tests in place
adding in templates and making some tests pass