fixes to test scripts, added filter option to command line tool