Tests for payload + some improvements to the three classes that from the payload.