Improved test spec
Merge branch 'patch-tests'