remove unused file in schema, adds tests and little ouput changes