|#667| +Shibha| Fixing unit tests for faciltiy service