fix some tests and headers