Move things around and add Base32 tests