JAL-629 Tidy up tests and replaced methods before merge to develop