Move test class to seperate folder