Get more tests passing, use explicit load/registration of models