Add test file
Merge in soxex, fix conflict in setup