Different controllers for serializable and calibrationByHeight
Attempt to pass unit tests