Updated tests to use submodule.

Also switched to the standard Maven resource location.
Removed debugging log cruft.

This code made the logic harder to follow and it isn't really
useful now that the reader works.