All problems fixed, except remaining new tests