JARVIS-340 JARVIS-337 Added citest