Fill in remaining gaps in test coverage