Restructured and pruned test files.