eliminated superfluous #includes from test main