new tests and more