tweak a test
restore the full lineup as I prepare to merge into master