Added test extraction