Updated test suite to use newer  decorator
Fixes #2