Compress time index into 4 characters.  Clean up nomenclature.  Make test actually test both time dimensions.