Add more tests to Scheme q3 and qA5