Refactor tests
Builtin hooks