Fix and re-enable integration and unit tests for 3.0