Feature/regression tests