Add unit tests
    
    Add unit tests to characterize and document the current code and clean
    up some existing code. Preserve existing behaviour, including all bugs.