RAII cleanups
OCB cleanup and additional tests
RAII and m_ namespace cleanups