More changes for unit testing