Tests for schedules, refactored user tests