[WIP] Fixed examples and tests have been broken by PR#1083