Finished off refactoring tests up to end of 5.3