Issue #137 - Added unit test project for VB queries; also fixed issue with
'And' and 'Or' operators