Simplify tests to sync with core
Merge pull request #161 from tzz/test/simplify

Simplify tests to sync with core