Updated to latest bundle lib; removed extra check guard in test mode;
extract mode