[#26]Improved fixtures