Eliminate duplicate fixtures for master
Merge branch 're-organize-tests' into next