Fix existing specs