Better api reporter; Fixed tests