Added tests to avoid regression problems