Cleaning up output
More tests cleanup