updates to testing, removed unnecessary includes