Tests are quieter and take advantage of DEBUG_MSG()
Merge branch 'master' into serialize