Changes to get tests running
fix for unit tests