fix tests, looking forward to see a green build in this branch soon