Reflect the latest changes in testing package

TestSuite has been extracted into its own package. See #737 for details. This PR fixes the code which has been broken as a result of it.