Fix test and create fixtures