moar spec test fixes