Updated system tests