started fixing test section

left to do: unnecessary detail removing, generalizing