Improve the default fixtures