Bring test coverage up to 100%