New acceptance tests and changes to equations
mains and notes from Dr. Garrett
Revert "mains and notes from Dr. Garrett"

This reverts commit e13850b0e3ce263dd6f0404c1304a5d392effa65.