Some refactoring and removed unnecessary test cases