Rework LDF testing for mock objects