Small fixes of generator, Test fix, corret director files selector in file windows