Small code tidy up and test results