Fix imports to get tests running.