Fixed some warnings in tests (merge me!)