unit tests tidied up and working for Commit