Review/fine tune Test cases