refs #7144 Added a couple more tests

A bit of refactoring needed to finalise the algorithm and the test.