Readd [WIP] extract test