Rules RI test
More rules smoke tests
Update comments