Tidied up test data and fixed default values
Added some docstrings and code comments