Fixed all broken tests.