Edit example manual to fix test

also includes some changes concerning macros