Namespace fixes, start on proper unit tests