Merge "Adding tests for dumps"