Tests

@jbydeley - would it be alright to pull in your changes? I'm somewhat new to github, so I'm not exactly sure how to proceed without a pull request.