fix test suite coverage
fix #787 - enable weighted categories
ammend #787 test suite and other fixes