#493: add new tests, add new rules