Tooling & test maintenance