Move test to the proper place