Fix up tests

Not sure what happened with nested plugin.xml, but added it back in. Also fixed a minor issue if watchCompass is pressed multiple times.