Equations can now have values substituted into them. Also updated unit tests.