fixup capped-cylinder and add tests