Fixed typo in setup tests.
Fixed merge conflict