Reorganize tests;  Some punctations