Fixed tests for #551