added test to make sure samples produce the expected output / adjusted samples output and small cleanup

added test to make sure samples produce the expected output / adjusted samples output and small cleanup #8482