Fixed All Test Cases (Need to reconsider)