Updated test fixtures