Added Raven v3 support
Testing improvements