fix up and add test fixtures
checkpoint