finish findCondition, clean Parser, read___ tests
resolved merge conflict from master