Created a unified test file, and documented things a bit better.