Added wave length attribute, some corresponding tests