Fixes for logging and test enumeration