adjusting and fixing the tests. Only missing the output format.