Expand test for UnitOfWork
Improve / enhance the UnitOfWork