fix impl of rule 3
fix tests, given new rules