Some Formating + new test