Got tests working, this spike is over.