Fixed a test
Fixed some bugs.
Better test reporting.