Added/improved tests

Restructured the markers to have :e :z :x elements.