New Test api and implementation allowing multiple tests to run simultaneously
Light refactoring and renaming, added comments