TestSuites refactored and some Classes moved