tests in sync with new code