Adding supervisor tests