Switched the model listeners to model interceptors and fixed a bunch of failing tests.