Revert "Rename package and make test"

This reverts commit 569ef55e218a7cfacb540994a09706cd2a07e28c.