Worked around UNSAFE issues (thanks Viktor!) and got the basic test working