Cleaning up unit tests, to be continued ...