Refactor of tests

Use examples instead of macros and more consistent naming in general