Add tests for compute supervisor
Merge