Changes the Test cases and added a few extra