Code review fixes, small unit test cleanups