Fixed some out-of-date test cases, and fixed some minor bugs in Query condition
Parameter and Binding simplification/refactoring. Rewrite's Back, All Right\! (All Tests Passing)