solved name collisions, build problems with tests