fix test

Change-Id: Ia70db9992464ab6bb3e18a2636ac9c1d170401cd
cleanup

Change-Id: Iff2103bf8f8be0fe878fe69ca14d0dcddc64b3df
framework: final fix

Change-Id: If387be036c8d47b0efaed1395571bd095e164ff3