Improve fixture