moved tests to correct test packages