Fixed several more tests

Change-Id: I30c39a31c57974eb7846664d1098ec0f08bfcc3a