Moving some methods
Fixing test description
Merge branch 'master' into cheatsheets