* Address potential errors * Add tests * Add clarity * Run formatting
* Fix json only serializing base properties * Run formatting * Switch to returning concrete type * Update method name