Running tests
Cleaned up handlers