FIX: hanging specs
Improve identity for scheduler
unhack spec