Take out previous fix for compileing of tests with FarSeer.  This was rejected at first.