Updates to fix unit tests
Updates to fix unit tests