Added test for dollar sign in desc, code cleanup.