Nick O: Added some tests, better logging on certain classes