#101: Remove test code.

resolves #101
Merge remote-tracking branch 'upstream/master'