added cylinder; tweaked test names