Add more regression tests