Move tests into package
Make imports from same package relative