Fixed some tests and added more summary information.