Verbosity of errors detection improved (optimizations + refactoring). Tests cleaned and extended.