Test reworked