Moved to using the patch decorator

The tests become a bit too difficult to read when nesting 'with patch'.
Merge pull request #49 from retr0h/retr0h/move-to-patch-decorator

Moved to using the patch decorator