simplify tests, don't sleep during tests
remove unused variables