fix tests and mustache support since API change