Fix/integration tests 20140314