enable all 4 builds again
enable non-e2e tests
remove debug statements