Fix warnings in tests, make tests pass again