Fix most of specs