Adding tests for the new feature.