Bring coverage up to 71%
Bringing tests up to 83%