Implemented new tests for new feature.