Testing framework changes