Fixes supervisor bug #93 and adds test scenario #94