organize test fixtures more