removed some comments; added new test material. closes #21, #22, and #23