fixing the tests

This PR fixes the tests. It is a mostly naive fix but it gets the job done, I don't fully understand the testing harness you folks are using so it was a bit hard to follow the line from exactly what you wanted to test to what you were testing. 

Essentially I took the approach that the test was wrong, not the functionality, and amended the tests accordingly.