Additional fixes/additions

Adding to the unit test for variable replacement and fixing minor
issues. Temporarily disabled "constant replacement" (such as pi or e) to
resolve interference with variables.