Update scheduler system tests (ready for review)