Fixed a few tests. Two still missing.