Continued rearranging test for neatness
Separated out test that elasticsearch starts with nothing in it
Add test_moving_just_elasticsearch to see that elasticsearch moves after flocker-deploy