Test fixes, no failing tests