Changed some things in the test classes and the main form