Fixes for final feature, add zend tests for final