quality checks refinements, all tests pass now