move test to appropriate place