[ch3] methodize
[ch3] tests
Merge branch 'ch3/master'