Making fixtures more generic