Refactored some scheduler tests