JARVIS-302 Added base tests
Merge pull request #5 from joola/feature/JARVIS-302

Feature/jarvis 302