Bring test coverate up to 100%