Updating tests to use new import path
15 files changed