Reorganized tests.
fixed indentation.