Cleaned up director BaseJob and tests