gets tests running, some other changes in progress
fixes merge conflict