Test case abstraction.
Merge branch 'develop'