Copy code and test from oslo-incubator
fix tiny typo