add sorting tests
change how custom handler works, add test for custom handler