Cleaning up newly introduced test suite runner

These are some minor cleanups to the newly introduced test utilities