#497: add new rules, change tests