fixed namespace collisions and broken tests