INF-2625 adding system tests