fixed bookmarks map and took out tools

Fixes #137
why do you have an "expect" in a before block?