Remove useless condition
Remove useless exception on test entitie
Refactor Blameable listener to allow method renaming