Re-add compile time flag for ABP scheduler
Removing non-existing test