Reorganized ScadaCore Test