Reverted to checking equality of epochs. Some issue with calibration factors.
Added test for checking equality of shape. Some PEP8 fixes too.