Fix minor issues in old Unit Tests.