Removes the test TODO in service which will result in user cannot validate issue when deployment.
Changes the default pageCount to 20 instead of 50.