1. Added token length limit
 2. Few more Assertions in a test case