Working on system test passing