updated config; fixed tests