Clean-up the tests a bit more, handle every case but the addition of a mountpoint for wait4path