Adding original tests to avoid regressions