terborg Fixed the first out of 3 tests that fail. 2 fixes to be done.