Test refactor added