Logging Fixes
Remove the user on term xml parse
Fix Testing Errors