Added a handler for script names. As well as tests.