non-dynamic scheduler + added tests