Enhance unit tests
Remove underscore prefix from all private properties name