Refactor tests
Rename object
Default null values to "0"
Remove safe guard