Fixed Static resolution for current tests.