improved test/main program
2 files changed