Fix unit test
Fix test and cleanup the output a little bit (this should/will be made better)