waiters: Rearrange image and volume waiter tests

Change-Id: I479ada919ff132bd0c370c692b6b9886b3c6d981
1 file changed