Fix spacing
Re-add missed finals
Synchronize tests