Properly seperated tests into classes for build slaves