Restore non-sauce testing functionality