Modified and tidied up tests and methods