QueryBuilder tested. Added validation to QueryBuilder.