Fixed broken tests. Please verify.