Added tests for the new feature.