Test methods implementation
Merge branch 'vs_121'