Fix tests

This should fix all the test errors with the apptools package.