Modified tests

Even better would be to factor out the test values and the type in a test data set such that you only need one test.