update config; update logging
small test modifications
update tests