Made obvious fixes to remove this test's errors.

Made obvious fixes to remove this test's errors.

The reason it wasn't cought before was because when I ran the testsuite
on my OSX system while it did report a failure it only reported one
failure.  I get this a lot for valid tests so I ignored it.  I get it
on OSX because at the moment something is going on with 'expect' on OSX
erronously reporting errors that aren't really errors.  This is currently
under investigation (it may be some kind of buffer/race condition).

From-SVN: r48821