Slightly tighter testing