Address feedback, fixup tests