Fixed various bugs.  Removed test logs