unit test updates to cover latest code changes