Added new test cases and also refactored old tests