Revert "Correct format, add tests"

This reverts commit dba713a3e7df8b72a58565b598a50d3d94429f97.