Move director tests to director dir and make them pass.