Fix some system tests