more comments to setenv
reformat, use Sample
class for managing samples
refactored tests