Finishes test corrections. Closes #159.