Moving test classes out of package and implementing MeasureController