new tests and bootstrap