Adjusted some tests for AIMS

Change-Id: I00f43fe6394e4a872151c4206f1f29e572877e96