Add tests to achieve near-complete coverage.

Fix small bugs with wrapper arguments.
Merge pull request #18 from TheMasster12/master

Add tests to achieve near-complete coverage.