code cleanup; interpolation had issues - solved all them; added --unittest option to verify interpolation works as expected