Code review responses and new unit tests