Reformat Javadocs
Rename Test clases
Add tests to verify basepayload pulls informaiton correctly