Ordering of classes and more tests