Reorg of picture tests + some new ones: 126 working, 51 expected fails, 682 TODO