Just a couple minor tweaks and polishings in tests and code