Adds more cases to specs: WIP