Use specinfra, fix tests