Updated test fixtures & loader