Furthered the cleanup of the UnitTests
A bit more sorting of the unit Tests