Refactor, add negative verification test