Fixed errors in tests

Change-Id: I4f5d6da2514e5dae0e59536d131d872e6bd9ba78