Fixed merge errors in tests