comments #4 - tests

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'categories' into develop