reordering and changing tests for OriginalSOurceType and make second non capital...