Fix tests

Change-Id: I41b68361db06ecba2a3b5700da289ba11269e674