first round of tests...
Merge commit 'fe7156e4ea6d268'

* commit 'fe7156e4ea6d268':
  first round of tests...