Fix tests
More specific names for -add-to-ns functions
Use yasnippet to jump back after add-use/require