Some goiardi specific changes to make tests succeed, but with a different (but perfectly reasonable) response code, happy