Add the tests back in.

Refactored the pom.xml, was messy. Alas, how I am getting maven to work
(at least in Eclipse) is what I feel is hacky as it requires the
dependencies which are only required by the tests to be downloaded on
build.