Fixed failing tests and added additional tests for new token rendering functionality.