Move test to same package