Fix failing test. Also, for now, use Quantity instead of type(self) otherwise we might end up creating EMConstant objects from operations.