Test fixes

Working on #76 revealed a few tests that are working but incomplete. Plan is to fix those up first in a separate PR before tackling #76.