More supervisor tests and fixes