Fix tests so that they work.

Also ensure consistancy with Karaage 3.

Change-Id: I8a0045777ed71ca55b20163dc0c85a686b86689e