Fixed minor method name problem.
Added tests for Samples
Merge branch 'pers'