Test framework fix