Move test into proper package