Restructuring test sources.
Rename tests to make patterns simpler.