change rules and tests