Move test to match main package