update testing
Merge branch 'master' into methods