CF #14 - Move tests files in more natural places