apply fixtures more selectively to improve perf
refactor fixture resetting