More unit testing changes