Refactoring and Testing

Before we make this package available on Packagist.org, let's do some refactoring and write some tests. As you'll find, these tests might drive us toward a slightly different design. Let's see!