DRY;
beautify tests scripts;
beautify scripts;