#102 accounting refactored for a new ztest