Added ability to quit a test
Restructure waiter
Touchups