test refactor
(and trailing whitespaces deleted)
Merge branch 'master' of github.com:leonko/stm