Fixed some slow system tests