Minor Additions #1

Minor additions to the client and sample app to fill in some small gaps. Includes tests where needed.

Not much to review; will automatically merge.