Reorganize tests
More descriptive log messages