better way to patch supervisor
updated tests for test/rest/*