Add supervisor tests and fix a few issues
Improve error log message and keep it internal