start generating fixtures for tests; starts progress on #6
small test cleanup