Adding back raise, marking test pending
Typo
Merge from upstream, update logging