Looking into this, let's try to get tests working as well.