Tag + Inspect test bug fixes