Fixed tests

Change-Id: Ic9a0425e44e3e2f0022c04f210b76f962ed4f6f6