Adds tests to close #20

Adds and updates most of @andytruong's tests from pull request #206. Thanks Andy! :+1: 

More of the tests will be added, I just need to merge this branch with the master to get the version fix before we can test that. That was fixed in 1b521ef0554c0d6514a3e5c30e1782564de5956e.