Fix some unit tests for deploy

cc @jamesls @danielgtaylor