Tightened a few things up regarding goal testing.