#36 category fixes  - better handling
#36 unit test fixes / updates