Fix some broken tests which are older than our sun