refactor, added helper make_spec_c1
all tests green