Eager loading nested support
Fix intermittent failing tests