Fix all tests, including full coverage