|#1220| +Balvinder | adding @Category to unit tests
|#1220| +Balvinder | fixing tests