Re-added system test from sprint 1