Added more regression tests