further mocking, better log intercepting, and util class