Reorganized tests around the same folder structure as the files they are...

... testing (more or less)