updated tests and cleanups
enabled logging
Merge branch 'factory_dep' into development