Adding test for new functionality