#595 fix rule message and add more tests