Refactoring + Not found test