Working on test for new functionality.