test logging, refactoring, rebuilding, test improvements
merge conflicts