Some stuff was wrong and some was missing after new features being implemented in tests over time. Change-Id: I7a279592a68ffc76408a8e728e76151534265cc0