clean up tests and reduce waiting times