Move test stuff inside of test classes