Incorporate integration test changes from signature branch