move test to proper location