Further improve unittest coverage