Clean up test to use connect on supervisor. Todos are lame github issues instead