Test cases cleanup - somre reformatting