more unit testing changes