Some unit testing changes.