Modified geometry() as discussed on #332.

Made it only accept a custom geometry command if the number of arguments is strictly one.
Added test for single-argument geometries