Fixed small problems in tests

Change-Id: Iff11a12d863cc062de7396b6e4bcf659f1fa6d39