Updated: improve test fixtures