Doing test cases again, make sure it works