fix tests
Merge branch 'origin/master'

Conflicts:
	tests/ObjectSql.Tests/ExpressionEnumeratorTests.cs