Added reference from Subject to Category
Added more tests for Subject/Category relations