Refactoring tests and update no reply rule