Factor out common/useful things from handlers
Test docstrings