do not try to merge stubs if version changed: take three, NPE fix
remove obsolete test
drop "ignore in test code" checkbox and use "suppress for 'Tests' scope" quickfix