Fixed verification bug and updated test cases.