Improve imports and supervisor test