Coding style: tests folders

As always, just a bunch of non logic changing changes