Set test params only if not given on command line
merge of develop 7 and rdf direct load, other maintenance