Extra unit tests/reordered classes