Added new Test Program/Reorganized