This is the followup patch for commit d0a53149f82a3587515a4371f0f4cad8570dc715) fixing issues with the unit tests not addressed initially. Change-Id: I7889bf908bcb64b79bf303c6ae356fd3f4e94a83