Merge "Add unit tests for image waiter"