Fixed integration tests in quick and dirty way ..