More tests, changed logging, and adding record