Moved tests out of sub-folders.