Move extraction to tests