Improve test on long techs
Style fix
Improve code.