Refactor tests again and add a custom reporter