Attempt Number 2

This version just bumps up the versions of some of the internal dependencies, adds a couple of utility methods and cleans up a little bit of the testing code.