fixup bugs after testing
update test to parameterized