!fixup remove extraneous string, add a couple of tests