Fix spec failure due to workspace mismatch

Also fixes intermittent failure from FactoryGirl picking a heinous
Origin type.