fixup! bad xmodule i and em stying, bad
fixup! resolving broken unit tests