Added parsing tests
Reverted a previous change
Added javadoc
Added javadoc
Cleanup tests