Validation for samples and saving
Added naming integration tests