Tweaks to LINQ expressions in the unit tests