refactor: move specs from individual fields to super field
rewrite specs to match newly discovered patterns