Some test fixes. All tests are working.