Add test to the category selection.
Merge branch 'master' into 153
WIP: Testing select marker.