FIX: Tighten up fwd test