more tests, more checks