More tests
Organized test output
Split up test code
Updated README