Readded integration test. Refactored so they compile but all but the most basic tests are failing.