Corrected failed system tests