More unit testing changes.