tidy up and added explicit explanations in test methods