Samples, tester, little cleanup