Intermediate state: still fixing findings from tests.