[Added] Some test cases, and an exception we might use