test: added more logging & tweaks