fixtures refactored