Refinements; all tests pass