Typo
...and renamed again
...and moved again
Export: Typo but possible BC BREAK!
Added newline at the end
Tests: Added test, unexpectedly; Refactored after a code-review