Add fixtures used by tests.
Fix remaining tests.