Test update

Fixed broken tests