Structural change for tests of access layer.