Resolved unit-test and added categorization
Resolved unit-tests
Resolved integrationtest