Changed test cases to be class-based with mixins