Error handling for tests that throw, combined callback code for tests & suites, cleaner task output, removed old commented code