fixed tests

Change-Id: Ibd35b02d50f8cba2a355de2a6d6ca7b3428d5cee