Refactor tests
Change output format