Added more scheduler tests and fixed potential pre-emption bug