Moved test_elf stuff around