Remove byteswap.h requirement, fix up the simple test script.