Move test-only class to tests