Housekeeping.
Refactored 32 and added a test case.