Move and rename
Start to fill out the missing tests

Copying over the example without writing the tests first wasn't bright
in the first place.