Restructed tests layouts

* Restructed tests layouts
* Added upload tests