Changed testing methods to my own discovery test runner, which allows much more flexibility in testing.