Added testing and reporting