Fixed tests, made own Testcases class