Moved tests to appropriate testing package