TestCase fix, formating fix