updated tests and cleanups
enabled logging