Changed models in tests to Message