Fix unit tests

Unit tests were fixed in order to support new system behaviour.
Unit tests cannot be executed alongside with integration. This issue
will be resolved in future patches.

Change-Id: Ie247327cd66bbec6e5eacb9c5f8ac280f8e3576e