Misc - reduce noisy log messages and speed up some unit tests