Fixed broken tests by 548beb5