Improved regression tests