Continued work on integration test (uncompiled)