better defaults, added other tests from hpcc