Added Serverspec tests, integration tests improved