Improving testability and completed test case for Token