New format update + unittest fixes

Fix percentage calculation
Fix unittests