Fix test cases
Safety