fixed almost all failing tests, still 11 to go...