minor update to mixins to pass unittests