Moving test files into classes.