Fixed all unit tests to work with refactored scales and axes