Changed reporter to TAP