Added more specs to satisfy coverage requirements