remove all unnecessary manual instance additions

and adjust tests accordingly

some test data was actually changed because instances were being added
over-eagerly