updated fixtures for a better test/demo suite