samsieber Fix macro (and simplify) & add a couple of basic tests

Latest commit 608a756

Sep 1, 2018