Comparison tests are back and working
Simplify paramaterizing test usage