Break up makeCommit & write more tests

See discussion