Fixed tests for #3653