various testing fw improvements