Fixed broken test on CentOS (it was not shim, but wget--fixed it by switching to curl); simplified test names and added tests to makefile