add new tests and more checks