added more testing; tests should be passing currently, but incomplete coverage