Make Testclass work and work on codestyle