:white_check_mark: Fix test issues