Merge pull request #15 from TheWatcher/wrap-result

Tests for the wrap_result functionality.