Move test to root and modify test runner