Added doc blocks
Added required serialization
Renamed test method names