add some consistency in tests
Merge pull request #682 from martndemus/code-style

add some consistency in tests