Refactored the lot a bit, added script to run both tests-suites