Delete some more unused spec. Replace mock() with double()