added integration tests
Merge branch 'master' of https://github.com/Reishi91/rdsaf