new tests, fixes