Add test exposing UnitOfWork merge bug