fix collision, remove warnings in tests