Tests system improved