Fixed all broken tests