clearer test names
test: cleanup
increased test timeouts
80 chars