Narrow test coverage focus, refactor some tests