Tweaks based on initial testing
Add some missing tests