Modified Q3 and Q6

Included tests for Q3 and Removed "cond" and corresponding test from Q6