Remove goto button and update tests

Fixes #496