Improve tests again, remove warnings and prevent some mount issues Upstream-commit: ff567f87293bfea3f9750bf2b07d97d7f3d1d85c Component: engine