Made unit test order more consistent (ascends in abstraction)