Change tests to reflect alterations made in calculation procedure

Fixes #515