Gigasecond: Fixing tests