All test cases are working now, but still need to be improved.