start Cloud tests. Restructure a bit