Fix test-suite and correct errors found in tests

Change-Id: I39c77f9e28d9207cd988c95c1a7b683042287a45