Updated the test and implementation
cosmetic