Added extra asserts to make test more safer to blind refactorings

Change-Id: I5dd159640bdc4f188c291017032ca96ca8b85d11