Fixed few failed system tests