order and then test fixes + added log-format-resolution-test to be tested