Fix some more systems tests