500: add new rules and tests