-move configuration to yml
-simplify test API
-polish
Merge remote-tracking branch 'origin/master'