update usage
remove x option
use setUp hook
add unit test

This is why you should always tests: there were so many mistakes!