tests for watch extension + some bugfixes