Fixing tests, not yet all working.