move custom handler tests to the right place