Bug/broken tests