2017 test data improved
rule 2040