Working on cleaning up calculate test cases.
Fixed mistake in autotest.sh.