Uniformed ' to " and completed main unit tests