Added regresion tests