Cleaned up UoW tests