Adjust SQL, start of LINQ buildout, additional test