Small test rework
Enh : Test - Split big test into his own file