* Look for package file without suffix when checking if package is installed
* Tidy up tests.