10/30/14 - entropy back; new test functions: correctGamma()