added most functionality to test program