Continue to refactor benchmark.hs to track new AP
minor fix: remove None from the default tested schedulers