Adds merge fixes for tests