Unit test and code for the new feature