Some Test Suite Additions

More control for test suites.