Bringing tests up to date.