unify and prepare behaviors
fix behavior tests
Merge pull request #69 from dereuromark/master-behaviors

unify and prepare behaviors