clean up tests
more clean ups
clean up tests - add speed boost when no-one is listening
merge