Add tests, change rules to use prefix rules