test fixups. squash me.