Tidy up test cases 27/3/2014