Tweaking tests a bit and adding more coverage