Fixed tests to match the use of show (vs print) for result printing.
Implemented curry'd definitions.