bugfix and add custumer's tests