Clean-up refinements and related tests