changes to fix two unit test