Fix specs related to this commit d07b6f4687acc6899690fbe409280b7fde2f7704