also doing new testcases with genuinegc
only adding undoWatch if necessary

(after getting some hints from Benjamin)
consolidation
bugfix that (strangely) was not required so far