Moves tests out of subfolders so they can be picked up by tox/jenkins Change-Id: I76369941dff73774f55dd77efd8d396fa9942d7d