Fixed the tests to have a more neutral Mixin class.