Updated system testing