#500: add new rules, change tests