Func Tests: minor tweaks