Fixes and tests for new impl