fix tests, change or add rules