Start adding tests for handlers