Fix some systems tests