Port tests from d7 and fix up failures'
Use none procedural code
Merge pull request #7 from marcingy/pub-156

Port tests from d7 and fix up failures'