Switched over to variant test in engine test. Removed DOM-relevant fixes from core.Main - not a good idea to keep dep tree small.