Fixed few system tests