Made existing specs pass