Last bit of changes for using SchemaPayload
Updated unit test
Removed toString redundancy