Move everything to test package