More Linq Tests
Code Cleanup