Add more tests for builtins
Add Ctrl-C abort for long-running functions