Added new test cases and removed unnecessary setup

Added new test cases and removed unnecessary setup from the test cases.