fixup accessor simplification
missing accessor tests