More tests and mocking for director