Test cases formatting; added templates for saving
Added saving support