Refactor some unit tests