make test program more generic
removed unsued code in test