Removed test programs from main program