Tried to work on test cases