minor edits
fixup tests