#26 Improved fixtures