Add serverspec tests
Some fix