Refactor and test empirical o-ring