fixes for tests and build_log
Merge pull request #1027 from JensTimmerman/fixes

fixes for tests and build_log