Fix specs
Remove deprecation messages