[task] changed Extension to builder pattern and adjusted tests to it