Create new sample, add tests