Move subclass creation into schedule;tests
Move subclass creation into schedule;tests