Proper formatting for the Use Cases, Testdata removed