Yes and yes. 

The ModelWithScalers class used to be defined in the scope of the momentum unit-test itself. It directly accessed the lr_scalers variable (defined again in the scope of the unit-test). I've moved the class to the top level and made lr_scalers a proper attribute of the DummyModel class. Since its optional, it implements both Model and ModelWithScalers.