refactoring testcases to have a much slim look