CHORE: Added more specs to cover some edge cases