Fixed gaps in test coverage