[Unittests] Resolved #540