More structure in test-suite.
Reorganized test files.