tunig tests + related changes/fixes