Finilised the unit tests