Modifications to tests to fit with new scheme (and to work on 0x1)