Working on Test cases